fix issue 30