Fixing fillData