Fixed bug in uploadable again.
Merge branch 'ent'