This seems similar to this bug, which was fixed in the upstream vim plugin here. Looks like the fix could be similar.