fix issue 156