fix [#580]