Fix after revert