Fixed setup not include data bug