Fix negative numbers and floats