Should fix most bugs