Bugfix: Undefined variables