closes #2116