Quick fix on #476