Fixed forking issue