fix issue 164