fix issue 180