Quick fix for remaining the create_date