ENH: Fixed layout bug