New version

... and better fix for circles