Fix problem with handling all data types.