fix according to comments on github