fix issue 152