Added an eval to deal with a race condition when removing a value