Fixing padding situation