fixed CR11
Merge pull request #15 from hys/CR11

fixed CR11