correctly remove on crash
more specs