BUGFIX: decorators