CONN-1368: Fixed