fixed regression introduced by latest commit for CrossPlatform clients