Add workaround for configuration/modello bug