Fix Values when there is a null