Bugfix for #54.