Fix for #363
Other bugfix for bug introduced while refactoring