Well, fixed a bug
No really, now it's really fixed. I've tested it.