isNonSelected issue fixed