Another fix for not_found