bugfix: #20