Fix #143

I'll comment inline