fix from 1.0.14 bug fix