Fix element issue again
Merge pull request #351 from arv/fix-element-again

Fix element issue again