Phuc Nguyen Ngoc Hoang

@marxjohnson Thank you for your advice. I updated the code for this fix. Please help me to review and let me know if you have any concerns.