context detect fix v2