Fix for #465