added passage of 'self' to decorator call