Correct datatype handling.