MOD: fixes mistakes