Should this FIXME be addressed here also? @halton