Fixed backward compatibility support.