Fix for #476