added hack for handling groups