Change fix for #157 (commit: 9a83e05de3ecbcb935654ba39c7ee11e86f60c2d ) not to make two map lookups.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
Merge pull request #1029 from nallar/master

Change fix for #157 (commit: 9a83e05 ) not to make two map lookups.