pull #108 issue fix