fix according to (#646)