fix issue 10