Backward compatibility fix.