Reverted this commit (2ae764b9690f323da631a894374b6be39413bdf5) since i didn't find the crash.