[BUGFIX] Fix Context detection bug - logic