more patch three fixing