Yup. The easiest way to avoid it is to not take the credit during the year. That way no worries if your situation changes. If you still qualify for the credit come tax time, you will get your money when you file.
