fixed regression in recent commit - context path