fixed more variable usage