closes #1048