Important bug fix for stop button