Fix #520