Fix bug -refs BT#8535

Add these commit