Still need this otherwise we may end-up pushing the same context twice