Revert "work on crash"