still not perfect on FF Mac, but an improvement