Fixed problem with couple of decorator that destroy function they decorate