Temporary fix for code compilation problem

Post commit code review : Tiffany Go