(should) fix BTC104