fixing correctly