should not crash anymore