* Fixing data upload