Fix issue with building elements