Fix for int/float