some fixes to make sure it actually works