Fixed circular modifier variables not being properly reset