~0.4.16 bug fix for https://jirap.corp.ebay.com/browse/POLYGLOT-454