Fix from patch