Feature #2746: fix cluster wizard