Small bugfix for #38