closes #1455