fix issue 55