closes #2226