This patch fixes the problem. Going to test it further.