bugfix: fixed #30