Fix for nvar > 4