Changes in previous fixes prevented new elements
Merge pull request #9 from curiosity26/7.x-dev-1.0

Changes in previous fixes prevented new elements