trying to fix across all devices