Yes, this fixme can be removed.