fix issue 20