fixing data type issues
2.4.0