closes #2266