Added fixme for 6.8