Vic Chang
fix the issue #250
c077f09