Fixed fuck-up by crash