fix null-po