circle: cleanup for the fix for bug#428