Fixing not evaluating a variable from 670951e0c7b9d0