Data creation bug fix.