Issue #441 June 2, 2017