fix for fail to panic