You are absolutely right. This is the only correct wording.