Fixed 2 HSD issues 4738132,4738131