Client pre lanch fix