Fix for #680