+ may fix BTC105

+ fixes BTC109