Make it work until domain is ready