Quick bug fix on variable names