Bug fixing: workaround to avoid public local model problems