Fix problem with ufo-core HEAD