closes #566