Fixed issue with multi cluster setup