See @garethsb's comment at end of #165
See @garethsb's comment at end of #165