Version 2.1.6b

Groups check simplified.