Bug #520