fix issue 217