Fixing #690