Found solution that seems to work, testing on all devices now