Code fix for build compilation problem

Post commit code review : Daniel Jao