fixing #690