fixing everything :D