fix cross platform
Fix xplatform again