fixing group handling - seems to be working now