fixed BTC121

fixed BTC139