Fixed issue with layoutSubviews