Work around cross-device problem