fixed #33
fixed #12