Fix for issue #21

This should fix issue #21.