#9 issue fix