Fix Internal Comparation issue