Fix clip to padding issue