Final version from MinLIU after fixed