Attempt to fix against rest regressions