Work around x-platform bug