Fixed; broken backward compatibility.