Bugfix for #66