This is more of a workaround than a solution; see my other comment in this thread.