I was able to fix the issue by applying the following patch