Fix group manager once more