Obsessive-compulsive padding fix