Fix #552 resume behavior