Fix bug with undefined vars
0.4.5