#760308

Possible fix for #760308.  May need a better solution, but this appears to function properly from what I've tested of it.