attempt to fix server to client transition bug