FIX: Previous fix not complete for the Clipper