Patched to Cross platforms.