I'll get back to you on this. @moollaza I think you modified the `self` thing?