Bugfix for #34