For backward compatibility #864