Setting correct recover flag (closes #2698)
Merge commit '551f5b02bbdca9bc6af279b42c3218448fd93e9a'