This line is an addition, anticipating code to address #855