Bug Fix : Irregular Mesh, split some IF condition