fix issue 40