closes #2055