fix issue 60