Better fix for clipper.