improved backward compatibility