refix for B70-ZK-2366 and B70-ZK-2368
Merge pull request #111 from hanhsu/refix-B70-ZK-2366

refix for B70-ZK-2366 and B70-ZK-2368