closes #2241