fix potential bugs
Merge branch 'master' of https://github.com/quaff/dop.git
x