added the behavior in case of stop message.