Fix #1: Stop buttons works