closes #2169