GroupReturn server side fix