Compilation fix 6