Add FIXME about UI glitch