Bugfix: 0 value was ignored