I'll try to fix the issue a bit later as we described here.