Bugfix: (hopefully) #26
