Fix from the trunk