FIx that DAMN new space error in client. 
TODO: Fix network in which was stalling the clinet.