added the real FIXME and added a note about the part we don't need to change