Fixed find_by_id