Maybe fixed the gold issue