adhoc fixes for bulge removal