bugfix: resolved undeclared variables