Fix decorators