fix issue 147