Attempt to fix utterly broken decorators