Make sure that $n is ever set

Change-Id: Ia24510ea0326e6f074232fee758eaac577628d62
Merge "Make sure that $n is ever set"