fix filling data