Fixed my dumb fix for #125 and #126.