Add workaround for disconnect issue