fix issue 220