closes #1503