Draft version of a fix for issue #65.

This is my rough draft of a fix for issue #65.