closes #2436