Cross-platform fix