Fixing boilerplate introduced a bug with variable naming