Fix of #520