Pre launch fix