Fix #73

Hopefully this message is not too long