BUGFIX: make sure option with value 0 is selected