Fixed bug 1886
Merge branch 'bug1886-_2' of github.com:robbenyang/bety into robenyang-bug1886-_2