Fixed  commands not working like they should