Add fix for Chrome