Bugfix: Undefined variables #2
All good things come in threes. Hopefully this time it works ;)