fixing contexxt