Bug fix (as always). I'll call it BF now 'cause I'm too lazy :D