Fix for #467