now it should work everywhere