Fixed #520