Minor code fix according to the review comments