fixed for bug B70-ZK-2368
Merge pull request #90 from hanhsu/fix-B70-ZK-2368

fixed for bug B70-ZK-2368