fix bug
Merge pull request #170 from warmdawn/dev

fix bug