r21 bug fix [ver 2.0.2]