Another attempt at a fix for issue #82.