#6 issue fix