Removed dropping of values