#244 issue fix