Fixing Check/Stop button flow