fixed var mismatches