Fixed bug with upload not going the WAITING again