closes #1776