Fix for #614