Some files having issues without this patch (reported by Douglas Soares)