fix for when using first_at