Close GH-672: Fix for #670.