Fixed patientId in context