BUG 8665: small change to fit the standars