Fix for #456.
Fixes #456