Bugfix for #72