Fix: Compilation error after merge. :(