closes #2225