Fix backward compatibility