Hopeful fix to prevent errors specified in issue #2 occurring again.