Fix singleton comm_spawn