Fix for #454