arguments order and bug fix