hopefully fixed crashes