Added check for both chain and auto groups