Fixed implementation of decorator
Merge branch 'hotfix/fix_decorator'