clean issue 545 fix