Fixed DBS crashes