further fixes for undercutters