(!) Fix: Memory problems