Fix issue with 0 being parsed as 1