Fixed bug in decorators