Fix non-zero option handling