fixed stop/start problems