Fix the merge, again

Somehow, when #80 was merged it broke again. This is hopefully the final fix I have to submit :frowning: