Well, hope it's truly fixed now

Everything worked well in dev env, but not in normal circumstancies...
Fixed... For now.