Fixed connection problems after CROS