It sounds like it’s already working correctly for you, but if you would like to try the beta it’s available here.