Chaplain fix attempt 5

Trying to update this correctly.