bug fix in decorators