Fixed issues with padding