Bugz/add crash