Bug Fix... variable names mismatch!