closes #568