bugfix: fixed #40