fix issue 39