Remove FIXME tag

This is not a FIXME anymore.