Clearing one more FIXME