FIX: duplicate execution of close group