fix according to (#646)

Pls merge and delete