Another attempt to fix group problem
Yet another attempt to fix inline grouping