Issue51

I guess that's it.
I've tested it manually it works like charm.