closes #1483