Regression bugfix, Fixes #386, See #342