++ Fixing build break