*6402* Removed fixme