PR #6 | Fix null equal & reinsert in if/else condition