Fixing elements a bit more