#6,#7 issues fix
#5 issue fix