Fix for xplat issue #809