Fix previous commit (this should help fixing #347)