bugfix: fixed #32, fixed #33