fixing httpContext bug (wrong context)