Need to reset the context at the end of the mixin
Updated Version