#9 #15 fixed var typo