Attempt 2 to fix padding