Removed potential layout problem