Bug fix: Variable mismatch
Bug fix: rest change