Fix box in certain cases