Fixing hotpotatoes lang see #5994