Bugfix: Undefined variable