Fix for #626