Fix random issue - Ref #237