mod2 fixes, works sometimes...