fix issue 42