Vic Chang
fix #issue250
b7fc4e3