Bug fix for issue #74 - shadowed variable warnings