quick bug fix around useFirst