fix issue 153