fixed bug with data