fix an issue with contexts