#50 Removed the original value field