Fix fatal on listing and detail