Merge Vincent's pause/stop fix