Added FIXME to clear log entry when its created