@nickvergessen, have you found better solution?