Fixing stupid bugggg !!! aaaaaaaaaahhhhhhh