Bug fix

Added data types conversion to construct