fixing issue (III)