Related to #34

This should do the trick.