Issue #699

obsolete codes always run the else branch ohhh?