See if the solution here solves the problem.