Fixed groups matching was broken