* Fix data pattern issues
  • Fix data pattern issues