Fixed bug datafactory