added new fix for padding