Issue91

This should fix #91.