Fix bug
Merge pull request #339 from dreamsxin/builder

Fix bug