#583: #583 fixed