Improve resume behavior