If your English teacher is a traditional grammarian, he would expect #2 as the "correct" answer. A modern grammarian would accept either one as correct.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.