Solve if else will trigger and return on 1 server problem