(!) Fix: DEP related crashes