Stateless fix