Context aware functions fix