Cleaning and fixing connection issue