fixed #7
fixed #16