Bugfix for #49