remove z critical bug