bugfix logic, call methods