fix issue 19