Attempting to fix an issue that is VERY hard to replicate.

Fixes #356 ?