Fixed handling of patients