Fix bug with this!=self