Backward compatibility fix for new features