bugfix: fixed #16