I forgot how to think... fix all stupidity of the last commit