Variable name collision

Fixes #40