Stop button fix