Fix logical dead code issue