fixed #12
fixed #16