Fix for Xplatform.