fix issue 151