Hopeful fix for issue #18.