Were you able to fix you problem. I have almost a same problem.