Fix special related fatal

Change-Id: I0392a986a30e372f0f19a5938095759e950b8861