Revert "Fixed: Use multiple groups (?)"

This reverts commit 1849849a461f9ae0f6964cd8e09f0dcc16ad5d26.