Try to fix null data move