fixing issue (II)