Current value bug fixed