Bugfix for #38