BUGFIX: missing vars moved