Minor design improvement