I will change it, this requires also changes in polyglot.