Bugfix for #4