Switch back to returning on match