Fixes #451 (after the merge)