#589: fixed