Fix using master connection