Work on #103

This should fix it.