One more multi-platform fix