Issue #132 - change may assist, but not been able to replicate problem yet