[DF-1314] Fixed Spawn as at development branch