fix issue41