Merge "Bug fix: add condition back"