Follow normalize output change