hopefully this will make it work for everyone