tag 2.0.0-RC4, fix 100% cpu usage