Compilation bug fix