fix issue 18