Fix for #450