v2.8.1 issue #11 bug fix