I don't think there is anything grammatically wrong with the first sentence. It doesn't sound that strange to me. And, I don't think you would necessarily need to replace it with your second version, although that is grammatically correct, as well.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.