Fixed first-by bug