bugfix: fixed #31