Deferred almost-fix. Well, its kinda hard to fix it. I'll commit it to make sure I won't fuck up anything more.