BUGFIXES: missing variables
BUGFIX: syntax error in previous commit