Fix custom groups