Fixed the stateless mode