Fix  where context was copied instead of using push and pop.