Added backward compatibility fix.