bugfix: fixed #21