Add bit more support to hopefully/eventually solve issue #15