Fix for #691