Issue #16 Fixing group link