closes #2231; see #2218