closes #1478, #1523