minor changes for backward compatibility