Fix bug on fill_by