Resolve the issue in RC2.