Fix : #1290 and logger calls