Cross-device compatibility fix