fixed client for non-HM connections