Fix for value iterator