Fixing the padding issue