Removed twice element lookups
Merge pull request #1 from zerkms/patch-1

Removed twice element lookups