Added this to the other places until we can put it in a centralized place