fix according by julien's comments on github