Fixed NumberFormatException