added fix to other data types and updated tests to check that the bug was fixed