Fix https://github.com/MetaModels/core/issues/333