Fix stateless mode