hopefully fixed crash