Have same problem.
Any chance sending patch my way?