fix null value on edit and transition