(fix) issue  #18(5)
(fix) issue  #18(6)