fixed clashing variables