Fix entropy decision bug and -1