fix bug: variable name
fix bug: mixin condition