WIP Fix infinit loop