fixed the context issue once for all