Fix, I think this way is maybe better