fix for forge 507