Follow up for rev. [67ebc6f]