Fixed bugs in pause / stop behavior