Fix for #644.