fixed backward compatibility problem