fixed a few bugs in decorators