Fixed fetch_by_