I have the exact same issue. Did you ever come up with a solution to this?