port #445 to indigo

#445 (which fixes #444) was never ported to indigo. Was unable to get cherry-pick to work, so I hand updated this one.