Temptative fix for killbill issue #170