Fix issue with layout helper