Indigo port of #161