[gh-570] Closs #568.