revert previous (non working) clipping fix