fix ontext condition