Fixed bug #66471 (Keep backward compatibility)