fix logic fail in Dev.