disconnect fix
merge