fix issue 51