fixes #40; maybe more to do on this but it's subjective