improved compatibility with BERSERKER cluster