Attempt at a fix for issue #48.