Fixed bug with old variable names