This patch fixes the above described issue.