use method_decorator (bug 971330)