fixing #695