Make it more consistent with Digit-layouts