hopefully fixed the crashes