fixes final complaints of CodePro
author: quan1992