Fix data type incompatibility