fix issue 49