Fixed a small bug where value handler was being set repeatedly.