Added comment/reminder of fixup needed