Fixing bug with context object getting blown away.
5.0.2