Refix #597. @HaoSs07 Would you mind trying