Bugfix for #0