Lawrence's fix for NBIA-764.