Fix suicide bug