closes #520