taking extra caution if decorators forget to clean up correctly