Variable mismatch Bugfix