Fix propagation issues and check for elements the proper way.