fix issue 137