Fixing a padding problem