AF-21: Removed FIXME comment