fix issue 130