context issues fixed