Another attempt fixing the crash