fixing for backward compatibility