fix bug
Merge branch 'issue273'