last commit broke it on all devices