Hopefully a fix to connection problem