Fixing nested decorators issues #35