Hack to partially fix Francesc bug.