hotfix 2 with master change
fit master hotfix
 merge both hotfix