Fixed issue related with padding