fix issue 54