SOAP-598 Changed hardcoded size