fix equality test and ready for debug if_stmt