Added dump before stop. Not sure if it's needed