Fundamentals catching up with valuation: Shah