Bugfixed backward compatibility.