Bugfix for #47