Fixed stop/start problem
fix #1