Reset extra_row - Related to #3037