Fix #804 resume behavior again