issue163 fix