Adjust trangnt57 pull-request.