Comment crash + fix crash