Fixed CS, added platform check