Again changed position of fork in client