2.04.0:zeress:164 Partial fix for gone_pagan