Fixed connection problem