Update my fork

I hope it works now...