Bugfix for #359