fix z30 issue