critic ordering bugfix