cluster-specific changes
try to resolve strange code state