Bugfix for #236