Bugfix: respect default value