Bugfix for #64