CFY-1352 fixed ctx usage