Thanks for the patch, @yojohnyo!
I had the same error and this patch fixed it.Actually this patch is not working with version 3.4
I manually made the changes on my local file and I thought that the patch is going to work, but in this version the modified line is a little bit bellow and the patch is failing.Anyway, I made a new patch which is working with the 3.4 version.