padding fix before i have to deal with Johan's commit