Fixes compilation error after merge