bugfix regarding #100