Fixing padding issue