Fixed bug where evaluation variables were conflicting with real simulation variables