Fix bug between self and non self parameters