Fix #520 Issue