Bugfix for #1