Bug fix 69

Fixes #69 in development.