Bugfix for #84