Fixing #125 while I am at it