Related with the decorator stuff, remove any appearance of this and use the decorator.