FEATURE: RETURNING state mostly works