fixed backward compatibility