Fix pause and stop