better fix for full circle