#4 - fix var references