Fix for grouped analysis does not work for non-grouped.