"FIXME" hopefully fixed

Please see comments in the change.