I meant to throw away numberfields changes...I'll revert this change.