2.04.0:zeress:111 Holy War fix Pt. 3

Should be the final fix