This patch should fix the issue I think. Please review.