*8644* Fix submission deletion errors