Fix for 0 value in option creation