Finally fixed annoying issue with floats and ints