Modify to keep backward compatibility