fix bundle variable name colliding