Temptative fix for killbill issue #170

see #170