fixes to decorated methods

The prior code for decorated methods has errors. This should fix it.